From a6f1f8dacfa831d7940a276a576b53472f67a6f9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 18 Jun 2014 18:19:39 -0400 Subject: [PATCH] Add more icon theme tests This test checks various directory size behaviours, with and without the FORCE_SIZE flag. --- testsuite/gtk/icons/15/size-test.png | Bin 0 -> 296 bytes testsuite/gtk/icons/16-22/size-test.png | Bin 0 -> 437 bytes testsuite/gtk/icons/25+/size-test.svg | 87 ++++++++++++++++++++++++ testsuite/gtk/icons/35+/size-test.svg | 87 ++++++++++++++++++++++++ testsuite/gtk/icons/index.theme | 27 +++++++- testsuite/gtk/icontheme.c | 47 +++++++++++++ 6 files changed, 247 insertions(+), 1 deletion(-) create mode 100644 testsuite/gtk/icons/15/size-test.png create mode 100644 testsuite/gtk/icons/16-22/size-test.png create mode 100644 testsuite/gtk/icons/25+/size-test.svg create mode 100644 testsuite/gtk/icons/35+/size-test.svg diff --git a/testsuite/gtk/icons/15/size-test.png b/testsuite/gtk/icons/15/size-test.png new file mode 100644 index 0000000000000000000000000000000000000000..a4061a5ace71416ba8eddec1d45c33283f6e31df GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^{2re*Zs;~DlHKWq7lv07;m(*zFhI5 zk#mk#$K#+FJ=d-pPEPyJUv;^Y(vJDserT;r7hBIQ=(}TG;?rvXHwE>3r0wLQvw4$w zoH$l&jWahkj>^#sB~S literal 0 HcmV?d00001 diff --git a/testsuite/gtk/icons/16-22/size-test.png b/testsuite/gtk/icons/16-22/size-test.png new file mode 100644 index 0000000000000000000000000000000000000000..fed0c268b18b8947dabcb564dc061b5916a85986 GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3HQwj^(N7l!{JxM1({$v_d#0*}aI z1_o}RQf^^JhFNnYfP(BLp1!W^_t=C)`2;vJA6fy0WHUn|N}Tg^b5rw5fLsO!=c3fa zlGGH1^30M91$R&1fE2w{b_NDUNlzEY5R21qr`UEi2Z*%3m;R8?dTo}|hK(ZHjz>iF z6k4S{#NVtb5zjktOqHX_?3!6p_G2-ouCp`KI1JMyWSE>2>?)4#o>RW#xkx`F!`=@5 zD#iSSuu##+X|6pRmmf-v)bJDv3Z3c_sB+j~g+|v_j`$nfdUvfWG>;N&QMwx?Xzm zyX~?}r~BVO*znt&f8TF;-uRKlv4;f>3LFo&VzGFf{0 z<(B=%_rG7S3j3^P6 + + + + + + + + + image/svg+xml + + + + + + + 30 + + diff --git a/testsuite/gtk/icons/35+/size-test.svg b/testsuite/gtk/icons/35+/size-test.svg new file mode 100644 index 0000000000..e6019934e0 --- /dev/null +++ b/testsuite/gtk/icons/35+/size-test.svg @@ -0,0 +1,87 @@ + + + + + + + + + + image/svg+xml + + + + + + + 40 + + diff --git a/testsuite/gtk/icons/index.theme b/testsuite/gtk/icons/index.theme index 20c53bb7c0..dbe538c5da 100644 --- a/testsuite/gtk/icons/index.theme +++ b/testsuite/gtk/icons/index.theme @@ -3,7 +3,7 @@ Name=Icons Comment=Testing of the Icon theme code Example=16x16/simple.png -Directories=16x16,16x16s,32x32,32x32s,scalable +Directories=16x16,16x16s,32x32,32x32s,scalable,15,16-22,25+,35+ [16x16] Context=16x16 icons @@ -35,3 +35,28 @@ Type=Scalable Size=128 MinSize=1 MaxSize=256 + +[15] +Context=none +Type=Fixed +Size=15 + +[16-22] +Context=none +Type=Threshold +Size=19 +Threshold=3 + +[25+] +Context=none +Type=Scalable +Size=30 +MinSize=25 +MaxSize=35 + +[35+] +Context=none +Type=Scalable +Size=40 +MinSize=35 +MaxSize=1000 diff --git a/testsuite/gtk/icontheme.c b/testsuite/gtk/icontheme.c index cef4ca855b..f57d5aa1a7 100644 --- a/testsuite/gtk/icontheme.c +++ b/testsuite/gtk/icontheme.c @@ -484,6 +484,52 @@ test_builtin (void) assert_icon_lookup_size ("gtk-caps-lock-warning", 30, GTK_ICON_LOOKUP_USE_BUILTIN, NULL, 30); } +static void +test_size (void) +{ + assert_icon_lookup_size ("size-test", 12, 0, "/icons/15/size-test.png", 15); + assert_icon_lookup_size ("size-test", 13, 0, "/icons/15/size-test.png", 15); + assert_icon_lookup_size ("size-test", 14, 0, "/icons/15/size-test.png", 15); + assert_icon_lookup_size ("size-test", 15, 0, "/icons/15/size-test.png", 15); + assert_icon_lookup_size ("size-test", 16, 0, "/icons/16-22/size-test.png", 19); + assert_icon_lookup_size ("size-test", 17, 0, "/icons/16-22/size-test.png", 19); + assert_icon_lookup_size ("size-test", 18, 0, "/icons/16-22/size-test.png", 19); + assert_icon_lookup_size ("size-test", 19, 0, "/icons/16-22/size-test.png", 19); + //assert_icon_lookup_size ("size-test", 20, 0, "/icons/16-22/size-test.png", 19); + //assert_icon_lookup_size ("size-test", 21, 0, "/icons/16-22/size-test.png", 19); + //assert_icon_lookup_size ("size-test", 22, 0, "/icons/16-22/size-test.png", 19); + assert_icon_lookup_size ("size-test", 23, 0, "/icons/25+/size-test.svg", 23); + assert_icon_lookup_size ("size-test", 24, 0, "/icons/25+/size-test.svg", 24); + assert_icon_lookup_size ("size-test", 25, 0, "/icons/25+/size-test.svg", 25); + assert_icon_lookup_size ("size-test", 28, 0, "/icons/25+/size-test.svg", 28); + //assert_icon_lookup_size ("size-test", 31, 0, "/icons/25+/size-test.svg", 31); + //assert_icon_lookup_size ("size-test", 34, 0, "/icons/25+/size-test.svg", 34); + assert_icon_lookup_size ("size-test", 37, 0, "/icons/35+/size-test.svg", 37); + assert_icon_lookup_size ("size-test", 40, 0, "/icons/35+/size-test.svg", 40); + assert_icon_lookup_size ("size-test", 45, 0, "/icons/35+/size-test.svg", 45); + + assert_icon_lookup_size ("size-test", 12, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/15/size-test.png", 12); + assert_icon_lookup_size ("size-test", 13, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/15/size-test.png", 13); + assert_icon_lookup_size ("size-test", 14, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/15/size-test.png", 14); + assert_icon_lookup_size ("size-test", 15, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/15/size-test.png", 15); + assert_icon_lookup_size ("size-test", 16, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/16-22/size-test.png", 16); + assert_icon_lookup_size ("size-test", 17, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/16-22/size-test.png", 17); + assert_icon_lookup_size ("size-test", 18, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/16-22/size-test.png", 18); + assert_icon_lookup_size ("size-test", 19, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/16-22/size-test.png", 19); + //assert_icon_lookup_size ("size-test", 20, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/16-22/size-test.png", 20); + //assert_icon_lookup_size ("size-test", 21, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/16-22/size-test.png", 21); + //assert_icon_lookup_size ("size-test", 22, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/16-22/size-test.png", 22); + assert_icon_lookup_size ("size-test", 23, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/25+/size-test.svg", 23); + assert_icon_lookup_size ("size-test", 24, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/25+/size-test.svg", 24); + assert_icon_lookup_size ("size-test", 25, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/25+/size-test.svg", 25); + assert_icon_lookup_size ("size-test", 28, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/25+/size-test.svg", 28); + //assert_icon_lookup_size ("size-test", 31, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/25+/size-test.svg", 31); + //assert_icon_lookup_size ("size-test", 34, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/25+/size-test.svg", 34); + assert_icon_lookup_size ("size-test", 37, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/35+/size-test.svg", 37); + assert_icon_lookup_size ("size-test", 40, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/35+/size-test.svg", 40); + assert_icon_lookup_size ("size-test", 45, GTK_ICON_LOOKUP_FORCE_SIZE, "/icons/35+/size-test.svg", 45); +} + int main (int argc, char *argv[]) { @@ -497,6 +543,7 @@ main (int argc, char *argv[]) g_test_add_func ("/icontheme/rtl", test_rtl); g_test_add_func ("/icontheme/symbolic-single-size", test_symbolic_single_size); g_test_add_func ("/icontheme/svg-size", test_svg_size); + g_test_add_func ("/icontheme/size", test_size); g_test_add_func ("/icontheme/builtin", test_builtin); return g_test_run(); -- 2.30.2